In my codebase we have two branches (relevant to this question) we have main and TestFlight. When we want to make a release, we do the following $ git checkout main $ git pull $ git checkout ...

I'm trying to wrap my head around who should be the author/committer and what the commit message would be in specific git scenarios. I'll use the below example repo to illustrate my question. Assume ...

To fast-forward from origin I can do git merge --ff-only origin/BR if BR is checked out, otherwise git fetch . origin/BR:BR (or git fetch origin BR:BR to also update origin/BR). Using git merge, if BR ...

I have a feature/new-feature branch that I'm trying to fast-forward merge into qc branch. I've been doing this all this time without issues, when all of a sudden today, Gitlab does not allow me to ...

I Just created the new repository in Azure DevOps I tried to pushed my project from the local computer and getting error message "Updates were rejected because the tip of your current branch is ...

I work with multiple branches, but I'm only modifying one of them (I'll call it working). I'd like to be able to get the latest for working but also get the latest for all of my tracking branches. ...

I have three branches first, second, and master: D---E---F first / A---B---...---C---... master \ G---H second first is a final version and is waiting to be merged ...

I'm trying fast forward develop branch to the main as git checkout main git merge --ff develop git push but that for some reason creates merge commit which introduces a new hash Then I have did that: ...

As I am not very familiar with git, I am not sure if the following ideas makes sense: In order to keep track of milestones while developing my code, I wanted to have a dedicated production branch ...

I have post-merge hook that check a few things after a merge/pull. However, these check are unnecessary after a fast-forward merge and they just wasting several seconds for no good reason. This is ...

I'm working on an Android java app and just finished a feature called "addmypicture" that I need to merge with "Master". I'd like to keep track of history so, as far as I know, the ...

I have three branches production , develop and a fix branch as shown below (A,B and C are commits) : A (production,fix) \ B (develop) I want to be able to only perform fast forward ...

What is the difference between a fast-forwarded git merge and a git rebase? Don't both accomplish keeping history linear and no merge commits? If so, why would one use one over the other? If not, ...

When I try to merge with command: git merge --no-ff -m <message> <source-branch> I get message: Already up to date. but it's not! When I'm trying to merge like: git merge origin <...

I am managing audio capturing and playing using java sound API (targetDataLine and sourceDataLine). Now suppose in a conference environment, one participant's audio queue size got greater than jitter ...