Answer the question
In order to leave comments, you need to log in
Is there a way to keep commits in dev and master in sync?
I understand with GIT, I can not understand if I'm doing the right thing.
origin is in bitbucket
there is a branch master -> dev -> feature
made edits in feature , then commit , pushed feature to bitbucket, made a pull request in dev .
accepted a pull request in dev
then it became possible to make a pull request from dev to master , did.
As a result, in the local repository the following picture (after git fetch --all):
remotes/origin/dev 8a124cd Merged in feature (pull request #1)
remotes/origin/master bb5e064 Merged in dev (pull request #2)
and when I create a new feature branch from dev , it also has the latest commit version at odds with master
feature/d3 8a124cd Merged in feature (pull request #1)
how to after merge dev -> master on dev was there an actual commit with master?
Answer the question
In order to leave comments, you need to log in
You can go to dev, merge from master, and then create your new feature.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question