There is a master branch (102 commits on the remote repository ), the staging branch went from it (104 commits, i.e. + 2 commits already there, also on the remote repository ).
In staging I began to lead the development of new functionality.
But there was a small bug.
I returned to master , made changes, started from there (with master ). It turned out 167 commits.

Will there be problems / conflicts with merge ? Files edited different in these branches.
How to do in this case?
thank

  • Will there be conflicts - and who knows. Here you will not try, you will not know. - KoVadim
  • Related question: Proper naming of branches . - D-side

1 answer 1

http://nvie.com/posts/a-successful-git-branching-model/

  1. Make a branch from the master branch.
  2. Fix there a bug.
  3. Murge branch in the master , and in staging .

enter image description here

There should be no conflicts with master in master . When staging in staging conflicts can occur if someone rules these files.

  • But in my case (I did not create a separate branch), do I need to switch to the staging branch and make a git merge master from there? - evans
  • @dmitriy if you fixed it into the master, then yes, merge. But, for example, if you do not want to pick up everything from the master branch, you can make git cherry-pick only certain commits. - Suvitruf ♦