Example

git diff 0022768e94766161a0c960e216e4afa26e34d66d 53b20cab480e20b4f6cad2e4795d36166eb6bf19 ':(exclude)*.mdx' > diff.txt

The post git diff with file pattern exclusion appeared first on Techy Things.

Thank you Linus Torvalds for these wonderful errors !

This can happen when you push a branch, do a pull request back to master using a web-based tool such as Stash or Github, then go back to your branch, do more commits and push, then do again a pull request and notice that the web-based tool is trying to merge back again all your changes, even the ones already merged.

So you merge master into your branch to actualize it then are hit with merge conflicts and if you try to go back to master you'll get this crap.

Solution

Don't do that. Don't continue editing your branch after it has merged with master. First sync up your branch with master after your PR has merged: `git pull origin master` so that your branch knows it has been merged in master. Then you can do new modifications in your branch and prepare a second PR.

Also to abort the merge (but keep your local changes):

$ git merge --abort

If you decide to proceed with the merge, carefully inspect each file one by one and add them and commit them. But if it doesn't look right, just abort the merge like above, keep a copy of your changes, create a fresh checkout and new branch where you add your wanted changes and redo the PR.

The post Merging is not possible because you have unmerged files. appeared first on Techy Things.

Solution #1 - Resolve conflict

If you want to go through with the merge, follow steps in the accepted answer at

https://stackoverflow.com/questions/26376832/why-does-git-say-pull-is-not-possible-because-you-have-unmerged-files/27187110

Solution #2 - Start fresh

1. Make a backup copy of your changes, this will erase all of your unsaved modifications.

2. Revert to the head of origin

git reset --hard origin/<mybranchname>
git pull origin <mybranchname>
git submodule update --init --recursive

3. Then manually put back your changes from your backup copy. Sometimes it is quicker like this, especially if a lot of time has passed since you last synched and your changes were localized.

If you know a third and better way please do comment below.

The post Pull is not possible because you have unmerged files. appeared first on Techy Things.

[dev@baobab vf]$ git checkout -b KRAK-1541-cleanup
vfcore/orthrus/external: needs merge
vfcore/vfcommonlib: needs merge
error: you need to resolve your current index first

[dev@baobab vf]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 98 commits.
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: orthrus/external
#

Bad Solution

With git reset HEAD <submodule-path> it resolves the conflict and then creating a new branch passes.

[dev@baobab vf]$ git reset HEAD orthrus/external
[dev@baobab vf]$ git checkout -b KRAK-1541-cleanup
M orthrus/external
Switched to a new branch 'KRAK-1541-cleanup'

This leaves some modifications in the submodule and is not a suitable solution.

The post CONFLICT (submodule): Merge conflict in 'xyz' appeared first on Techy Things.

This will cleanup local branches.

You may also want to cleanup and compact your repo
WARNING: This may temporarily use twice as disk space so do not use if you don't have enough free space

git reflog expire --all --expire=now
git gc --prune=now --aggressive

If it fails due to missing disk space, it won't cleanup and will leave your disk 100% full. You then have to do

rm -f .git/objects/*/tmp_*

If you set this up as an automated task, you might want to cleanup automatically on failure with something like

git gc || rm -f .git/objects/*/tmp_*

Troubleshooting

$> git gc --prune=now --aggressive
Counting objects: 556318, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (542764/542764), done.
fatal: sha1 file '.git/objects/pack/tmp_pack_OBQCK7' write error: No space left on device
error: failed to run repack

Solution

rm -f .git/objects/*/tmp_*

The post Git purge local branches that were deleted on remote appeared first on Techy Things.

• Commit your changes but do not push yet
• git format-patch -n HEAD^
• Then go in each submodule you care and do the sam


Method #2

Submodules git submodule --quiet foreach --recursive 'export NAME="${PWD##*/}"; git --no-pager diff --src-prefix="a/${NAME}/" --dst-prefix="b/${NAME}/"'

The post Git create patch with submodules appeared first on Techy Things.

The post Git merge two folders from unrelated branches with different path appeared first on Techy Things.

2) Type this command where "theFolderImissSoMuch" is the folder to restore.

$> git checkout 1d4b99fe3e312e4cb26b5e484d00cdcbc199e7cb^ -- theFolderImissSoMuch

The post Restore a deleted folder that was deleted and the commit pushed appeared first on Techy Things.

$> mkdir my-new-repo
$> cd my-new-repo
$> cp -R ../old-repo/.git ./
$> git checkout -- *

The post Best way to duplicate a git repo on local PC appeared first on Techy Things.

Solution

$> git reset --mixed

The post error: Error building trees while doing git commit appeared first on Techy Things.