Questions tagged [fast-forward]
Fast-forward term refer to DVCS merge technique.
fast-forward
111
questions
1
vote
0
answers
51
views
Why does fast-forwarding with git fetch reject an ahead branch?
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 ...
- 1,599
0
votes
0
answers
77
views
Enable long press on Exoplayer FFWD and RWD on Android TV
It seems that, by default, Exoplayer FFWD and RWD buttons on Android TV do not accept long presses and require the user to press the D-PAD center button repeatedly to seek through the video.
Is there ...
- 89
0
votes
1
answer
3k
views
GitLab says merge conflicts must be resolved but there are no conflicts
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 ...
- 1,115
0
votes
1
answer
640
views
Why I am getting Updates were rejected because the tip of your current branch is behind message even though I am pushing to a new repo just created [duplicate]
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 ...
- 1
0
votes
2
answers
68
views
Does git have a built-in command to ffwd all tracking branches?
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. ...
- 11.7k
0
votes
1
answer
43
views
Can I imitate fast-forwarded pull if my local branch diverges with remote in Git?
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 ...
- 61
0
votes
1
answer
524
views
git merge --ff creates merge commit
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:
...
- 3,994
-1
votes
1
answer
70
views
Using git to track deployable state of code
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 ...
- 920
0
votes
1
answer
290
views
Skip post-merge hook when fast-forwarding
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 ...
- 4,630
3
votes
1
answer
452
views
Git: Android Studio "--ff-only" merge option is greyed out
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 ...
- 2,588
0
votes
1
answer
658
views
Fast forward merge after git flow hotfix
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 ...
- 2,477
27
votes
2
answers
31k
views
Git Merge Fast-Forward vs Git Rebase
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, ...
- 395
0
votes
0
answers
514
views
How to merge with merge commit
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 <...
- 433
-1
votes
2
answers
250
views
Fast Forward implementation in Realtime Audio byte array in java
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 ...
- 424
0
votes
1
answer
554
views
Using GitHub website for non-fast-forward merging of PRs, instead of Git CLI
I'm wondering if there is an equivalent to performing the following
to do a non-fast-forward merge into the current branch for preserving my branch topology:
git merge --no-ff <some-branch>
......
- 680