...rovide you the full functionality of rebase and merge within the Bitbucket UI to help you manage your Git history according to your team's preferences. These new options have been among our most h...
hello, In bitbucket, I'd like to force rebase as only pull request strategy on my repository, but rebase option does not even exist. I only have: Merge Commit, Squash Fast Forward Is it a w...
I follow this tutorial Interactive Rebasing with SourceTree and get this empty dialog: Using the CLI I can rebase successfully. I'm not sure if this is a bug or not
When I rebase a branch and push that branch to bitbucket (using push -f) the number of commits that the Jira shows increments by the total number of commits in the branch. For example a...
Hello, I have a local branch which has been pushed to remote branch already. After pushing to remote, I had to change the commit message. Therefore I used interactive rebase to change the c...
Hi, We have a new project in BB I want to know if there's a way to block the creation of PR (from BB console or from the IDE) until the user pull/rebase from the master branch to his l...
Just updated Sourcetree to 3.4.1, and rebasing interactively shows a blank page. My machine is windows 10
When I'm trying to "merge" my PR, I know that there used to be an option for doing rebase from Bitbucket, but I don't see it now.... do you know where it is?
...d00 - even for a rebase. Any idea what to do? $git fetch origin $git checkout origin/master $git reset --hard origin HEAD is now at f513....... $git branch * master $git log --all --o...
In our company we are using on premise bitbucket version 6.10 and we have some problems when trying to use rebase on PR. We have activate merge strategy “Rebase + Fast-forward” but this option is n...
...44499235.html Can you explain me about the #4 Rebase, merge (rebase + merge --no-ff) and how do I perform this operation using git command line? As to my knowledge, git rebase c...
Also let me know if we can configure Only-Pull-from-Parent (with Rebase) and Only-Push-to-Origin (with Force), without having the risk of accidental Pull/Push to the wrong repository
We using JIRA Cloud and each time we rebase some commits on a specific task and push it back to repo, the log time of those tasks (smart commits) keeps on getting added. is there a way to tell J...
Hello, I noticed an error in one of the git tutorials about rebasing https://www.atlassian.com/git/tutorials/syncing/git-pull. The diagrams about git pull --rebase are wrong. A rebase replays t...
We use Bitbucket Cloud and our strategy for PRs is to rebase the branch on the target so it becomes a fast-forward and merge with a merge commit, aligned with the Rebase, merge strategy available o...
Used the below commands to sync the GIT repo with all the latest SVN commits. git svn fetch java -Dfile.encoding=utf-8 -jar ~/svn-migration-scripts.jar sync-rebase java -Dfile.encoding=utf-8 -j...
...here is also this "rebase" function instead of merge and a. I don't know how to turn this on and b. if this will fix our issues or create more? basically tortoise svn works great but we have a github a...
If I do a right-click and "rebase current changes onto master" in Sourcetree, and then have conflicts, there seems to be no way to finish the process in Sourcetree. The only way I can figure it o...
I don't understand what git is thinking sometimes. In SourceTree, I pulled the latest code from the repository with rebase selected, it told me it couldn't apply a patch, and to resolve the issue m...
Hello, I'm confused about how merges work. I had a situation today where I tried to rebase my code and it told me I had to manually merge some changes. So I was able to do that in visual Studio 2...
For some reason I am unable to use the mercurial rebase feature in SourceTree for Windows. My current version is 1.6.18.0 but this problem as existed for a while. If I open up the options dialog I c...
I've used SourceTree before and sometimes had this problem, but now it seems to be stuck in this "state": I cannot rebase interactively. When I select a commit on my active branch and choose "Rebase...
...istory from merging the feature into main. However, when I try to do this using sourcetree with "interactive rebase" by simply squashing the commits, if there are any conflicts at all between entries i...
...it tedious since it takes four steps: 1) checkout the topic branch, 2) do the rebase, 3) checkout master, 4) do the merge. So, when I first saw the "rebase instead of merge" checkbox in the merge d...
When I start an interactive rebase in sourctree, there's an option 'Amend commit?'. I was expecting ticking this option would put me into something similar to git gui's "amend last commit" f...
Copied to clipboard