Skip to main content
added 59 characters in body
Source Link
Joris Meys
  • 1.9k
  • 14
  • 20

Weird that nobodyAs Polygnome mentioned that, you can actually merge your frontend branch with your backend branch instead of the masters. Even with the current branch setup you have now, you can simply do:

git checkout frontend git merge backend 

or simply

git merge backend frontend 

Keep in mind though that if backend changes are not accepted and more work is needed, you'll have to merge updates from the backend into the frontend to avoid conflicts. Once the changes are accepted into the master, you can rebase your frontend on the master to get rid of the backend merge commits.

Technically you could also do everything with rebase, but that will mess up the commit history of your frontend branch. Where I'm coming from, this is considered bad practice. YMMV

Weird that nobody mentioned that you can actually merge your frontend branch with your backend branch instead of the masters:

git checkout frontend git merge backend 

or simply

git merge backend frontend 

Keep in mind though that if backend changes are not accepted and more work is needed, you'll have to merge updates from the backend into the frontend to avoid conflicts. Once the changes are accepted into the master, you can rebase your frontend on the master to get rid of the backend merge commits.

Technically you could also do everything with rebase, but that will mess up the commit history of your frontend branch. Where I'm coming from, this is considered bad practice. YMMV

As Polygnome mentioned, you can actually merge your frontend branch with your backend branch instead of the masters. Even with the current branch setup you have now, you can simply do:

git checkout frontend git merge backend 

or simply

git merge backend frontend 

Keep in mind though that if backend changes are not accepted and more work is needed, you'll have to merge updates from the backend into the frontend to avoid conflicts. Once the changes are accepted into the master, you can rebase your frontend on the master to get rid of the backend merge commits.

Technically you could also do everything with rebase, but that will mess up the commit history of your frontend branch. Where I'm coming from, this is considered bad practice. YMMV

Source Link
Joris Meys
  • 1.9k
  • 14
  • 20

Weird that nobody mentioned that you can actually merge your frontend branch with your backend branch instead of the masters:

git checkout frontend git merge backend 

or simply

git merge backend frontend 

Keep in mind though that if backend changes are not accepted and more work is needed, you'll have to merge updates from the backend into the frontend to avoid conflicts. Once the changes are accepted into the master, you can rebase your frontend on the master to get rid of the backend merge commits.

Technically you could also do everything with rebase, but that will mess up the commit history of your frontend branch. Where I'm coming from, this is considered bad practice. YMMV