About 1,759,493 results (4,458 milliseconds)

Making old Patch set the current one

https://groups.google.com/g/repo-discuss/c/yJtIqP3Rnxs
Mar 23, 2011 ... the most recent commit of the released branch (so although Gerrit still states "master", I assume merging will fail later after submitting it).

Try as I might, I just don't understand git. Can anyone please help ...

https://groups.google.com/g/git-users/c/fNnX4rUn6oM
Oct 25, 2016 ... This happens after I get a merge error. I fix it, and then go to commit again but get the error: "You are not on the correct branch." Using ...

Merge after importing a project to gerrit fails because of missing ...

https://groups.google.com/g/repo-discuss/c/1irZMIM5TZE
Jan 24, 2017 ... You do not have permission to delete messages in this group. Copy ... Commits which are already merged into a branch (in Gerrit) will not ...

Tree Conflicts after merging a directory with --accept="theirs-full"

https://groups.google.com/g/subversion_users/c/_A6vL_cTtss
I have no local edit of the destination path/files. They are up to date.(svn update) (In fact I even went to far as to use the OS to delete the path and ...

[llvm-dev] Workflow to commit changes using git alone (?)

https://groups.google.com/g/llvm-dev/c/MRa4Tfc6q7o
Nov 8, 2019 ... ... do you need another branch in the first place. I may be missing some key ... After the patch is reviewed and committed I can simply delete my ...

Question about when to merge master into my feature branch

https://groups.google.com/d/topic/git-users/ia0CHuzaLdc
Dec 27, 2015 ... You do not have permission to delete messages in this group. Copy ... branch, they will feel pain after you perform a rebase. I'm not sure ...

Why am I getting "You have more than one commit that you are ...

https://groups.google.com/g/repo-discuss/c/GU5OnoSSfFY
Nov 7, 2014 ... > After doing "git pull" and getting merge patches, and then trying > ... I usually delete my local branch after that and if I need to do more ...

A Git Workflow Walkthrough - Merging Pull Requests - git, tools and ...

http://feedproxy.google.com/~r/bocoup/~3/LEkW7GGZuCY/git-workflow-walkthrough-merging-pull-requests
Aug 13, 2015 ... Either way, once the PR is merged into master, we can remove the remote branch to keep our GitHub project cleaned up. Delete Branch. You can ...

Gerrit - avoid developer merge code after code review

https://groups.google.com/g/repo-discuss/c/xVYm-kLAzSo/m/ytp0C7ugO9QJ
Dec 22, 2010 ... Hi, I have a question about how I can merge the new changes to Gerrit master branch after code review. Let's say I have:

Understanding ChangeMergeQueue and MergeOp

https://groups.google.com/g/repo-discuss/c/XU2iPdze0gA
// Request that the job queue handle this merge later. // e.needMerge = true; return false; } } Here we see that merge first checks if a branch can ...

Prevent building branches/PRs existing before the first branch ...

https://groups.google.com/g/jenkinsci-dev/c/NJoc_YQMy44
I think such feature is required by many people, so I would like to implement a solution which could be merged to the plugin. ... Delete. You do not have ...

SVN 1.8 merge (branch reuse) seems broken when having local ...

https://groups.google.com/g/subversion_users/c/joKfu_uEs0I
Mar 6, 2014 ... the feature branch after reintegrate. This is the error in step 10: svn: E195016: Reintegrate can only be used if revisions 346 through 349 were ...

Trying to understand git-tfs clone --branches=none

https://groups.google.com/g/git-tfs-dev/c/-Wq9FKNUbho
I'm certainly missing something, but what I'd expected is that the merge changesets themselves are taken (they've been checked-in on the target branch after ...

Merging Branch to Trunk takes 20 min for one change

https://groups.google.com/g/tortoisesvn/c/aWABI5l8rjM
All we did after it was merged was rename it. Should we merge it even though ... Also, make sure after you reintegrate a branch you either delete it or do a ...

git - How to change `branch-2`'s base branch from `branch-1` (which ...

http://feedproxy.google.com/~r/stackoverflow/tGpU/~3/gMi76WOu2z4/how-to-change-branch-2s-base-branch-from-branch-1-which-is-already-merged
May 1, 2019 ... ... I screw up, I can always just delete it and try again. And if things do go well, I just delete the merge candidate branch after merging. – RichS.

The Life of a GitHub Action - Ramblings from Jessie

http://feedproxy.google.com/~r/thechangelog/~3/sBVLiXdUVo4/
Jan 13, 2019 ... ... delete branches after the pull request has been merged. All the code ... we can authenticate and have permission ## to delete a branch.

Using version control and deploying | Looker | Google Cloud

https://cloud.google.com/looker/docs/version-control-and-deploying-changes
Sep 11, 2023 ... In the Branch Management tab, you can delete branches in two ways: ... will prompt you to merge your changes to the primary branch. The type of ...

error deleting branch after merging with squash

https://groups.google.com/g/git-users/c/7T_jEeCXb_c
Mar 31, 2019 ... error: The branch 'upgrading' is not fully merged. If you are sure you want to delete it, run 'git ...

possible to re-merge branch after a change ?

https://groups.google.com/g/git-users/c/lTdSbhiENVU
Jan 12, 2021 ... (let's call it "patch") In that patch I intrroduced also some small modifications which are necessary for the next "feature" branch. Th ereason ...

Gerrit not updating branch after merge

https://groups.google.com/g/repo-discuss/c/ko9vyryFHvA
Mar 6, 2020 ... I can delete the master branch and recreate it at the sha1 point I think it should be. Requires abandoning about a dozen open changes. I can ...