![Git] How do I merge featured branch into master, when master have already be edited (e.g. bug fixes) - DEV Community π©βπ»π¨βπ» Git] How do I merge featured branch into master, when master have already be edited (e.g. bug fixes) - DEV Community π©βπ»π¨βπ»](https://res.cloudinary.com/practicaldev/image/fetch/s--URX_gbVq--/c_limit%2Cf_auto%2Cfl_progressive%2Cq_auto%2Cw_880/https://i.imgur.com/q6rQIKUl.png)
Git] How do I merge featured branch into master, when master have already be edited (e.g. bug fixes) - DEV Community π©βπ»π¨βπ»
![Using SmartGit to follow the GitFlow branching and workflow model | endjin - Azure Data Analytics Consultancy UK Using SmartGit to follow the GitFlow branching and workflow model | endjin - Azure Data Analytics Consultancy UK](https://res.cloudinary.com/endjin/image/upload/f_auto/q_80/assets/images/blog/2015/01/GitFlowworkflow.png)
Using SmartGit to follow the GitFlow branching and workflow model | endjin - Azure Data Analytics Consultancy UK
![git - Gitflow: Should I squash commits when merging from a release branch into master? - Stack Overflow git - Gitflow: Should I squash commits when merging from a release branch into master? - Stack Overflow](https://i.stack.imgur.com/rE8jd.png)