About 1,336,638 results (1,789 milliseconds)

"Cannot merge into mixed-revision working copy" TortoiseSVN 1.14.1

https://groups.google.com/g/tortoisesvn/c/i15g_7BYhgI
I'm getting this error a lot when merging after the latest TortoiseSVN update and having to update each time then re-merge. This can happen on the same ...

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

https://groups.google.com/g/jenkinsci-dev/c/NJoc_YQMy44
2) test PR after the (virtual) merge operation - presents the state after merging ... Delete. You do not have permission to delete messages in this group. Copy ...

Easily clean up a team's remote git branches | Ovid [blogs.perl.org]

http://feedproxy.google.com/~r/DougHellmannLinkBlog/~3/YMLVc3Ud_V8/easily-clean-up-a-teams-remote-git-branches.html
Nov 20, 2016 ... At work the rule is that when you do merge someone's branch after code review you also delete it. We use GitHub Enterprise, which makes this ...

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 ... branch and push the results of that merge back to the Gerrit server. In ...

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 ...

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

https://groups.google.com/g/subversion_users/c/_A6vL_cTtss
changes that were already merged between these branches again which can lead ... Hence, just run 'svn resolve --acccept working nz/shared'. This will remove the ...

After git-tfs clone of two TFS stores, how to merge?

https://groups.google.com/g/git-tfs-dev/c/NB4L5kCCOXg
Jul 10, 2018 ... I can clone each TFS server into its own local GIT repo no problem, branches, history, all lovely. Is there any way I can merge the two together ...

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 ... Delete remote branch. Either way, once the PR is merged into master, we can remove the remote branch to keep our GitHub project cleaned up.

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 ...

Gerrit - avoid developer merge code after code review

https://groups.google.com/g/repo-discuss/c/xVYm-kLAzSo/m/ytp0C7ugO9QJ
Dec 22, 2010 ... You do not have permission to delete messages in this group. Copy ... master branch after code review. Let's say I have: 1) Server (gerrithost) ...

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 ...

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 ... You do not have permission to delete messages in this group. Link.

Bitbucket Pull Request auto delete branch

https://chrome.google.com/webstore/detail/bitbucket-pull-request-au/iffllgmebelmfdfiiagjgbpjhplobfem
Jan 31, 2023 ... Automatically checks the checkbox to delete the current branch after the pull request is merged on Bitbucket Cloud.

Merging Branch to Trunk takes 20 min for one change

https://groups.google.com/g/tortoisesvn/c/aWABI5l8rjM
repository. And you should not remove the svn:mergeinfo properties - if you remove those before a commit, subseqent merges will take longer and longer.

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 ... ... can always just delete it and try again. And if things do go well, I just delete the merge candidate branch after merging. – RichS. May 1 ...

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 ... can authenticate and have permission ## to delete a branch. secrets ...

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 ... I could now of course just reedit th efeature and change it, but I preferr to change it in the "patch" branch and re-merge. Curse of action (git ...

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 ...