get-git | Chrome extension that spots web accessible Git repos

i found the answer: How to get Gitlab merge request description in Gitlab CI?

But there is no answer to the request:

Disclaimer

I realize I'm using git for something it's not really designed for. But I'm so close to getting it to do what I want. If you have a better idea let me know...

TL;DR

I want to keep both binary files when there is a merge conflict. I've seen an answer here but I don't think it addresses my specific problem, at least, I couldn't figure out how it's actually accomplished.

The problem

I have hundreds of small (~4kb) binary files on a single master branch - each one is a sheet music file. Each piece of music needs to go through various stages before it's complete: formatting, adding chords, fixing lyrics, revised by person #1, revised by person #2, etc. With some batch files I can simply and easily both write and parse commit messages to generate a sort of report. Git seems to be a great solution to programatically track the status of each song. It's also very important that I keep the entire history of changes for each song and be able to look through the history easily (tortoisegit enables me to do this - right click the file and choose "git show log").

Every time a file is modified, the change is committed (i.e. each commit signifies a single changed file). So let's say I've got two songs, A and B (There are actually more than 400). There are multiple commits signifying changes in song A, and multiple commits signifying changes in song B, and the changes are spread out over the entire master branch like this:

A₁ - A₂ - B₁ - A₃ - B₂

Now let's say a user makes changes to both songs A and B and pushes it up to the remote, but I am also working on songs A and B and try to pull in changes on top of mine, like this:

Remote:
A₁ - A₂ - B₁ - A₃ - B₂ - Their B₃ - Their A₄
                                        ||               ||
Local:                              V               V
A₁ - A₂ - B₁ - A₃ - B₂ - My B₃     - My A₄

Classic merge conflict scenario, right?

How can I end up with something like the following?

Remote:
A₁ - A₂ - B₁ - A₃ - B₂ - Their B₃ - My B₃ - Their A₄ - My A₄

Local:
A₁ - A₂ - B₁ - A₃ - B₂ - Their B₃ - My B₃ - Their A₄ - My A₄

I've tried all the combinations and possible solutions that I could find on the web (I've learned a lot about git in the process) but can't seem to crack this one. Any help from programming wizards like yourselves is appreciated. I hope the question is clear enough.

I realize that my question is very similar to How to list the parent commit of a stash in `git stash list` and Get git stash parent commit, but those had so many confusing, disparate responses that I'm asking my own question.

Let's assume that if I run git stash list, I see stash@{0}: On featureX: someMessageHere

How can I reveal the hash of the commit that I was working from when I made that stash (which I guess could be considered a parent commit)?

I've seen so many different answers, and I'm confused about what these each do, how they are different, and which one is the answer to my question:

• git show stash@{1}^
• git log -1 commitish^
• git log -1 stash@{0}^
• git log -g --no-walk --parents refs/stash
• git for-each-ref --format='%(refname:short)' --points-at $(git rev-parse refs/stash~1) refs/heads

I am trying to use Docker in order to run my php - gulp website. Here is the tree of what I've created:

I try to go get a repository from a private gitlab server, from a mac.

I set the git config (~/.gitconfig) to use ssh instead of https :

I'm not quite sure even how to ask this question... but perhaps:

I am in a conflict state. I want to use null-op or /bin/bash as my merge tool.

That is, I want git to create the (REMOTE, LOCAL, BASE, etc) files, and then drop me back to a prompt for manual diff / merging. And then I want to tell git when I'm done.

What is the mergetool I want, and how do I specify it?

Note: This is a related question, but 1) it conflates rebasing (I'm not rebasing), and 2) there is no satisfying answer, e.g. "choose any mergetool and force-quit it." :P

Currently, I'm writing a PowerShell module which automatically configures aliases for all git commands, inspired by git-sh.

Then I wrote functions below.
The Enable-GitAliases function is the entry point to configure aliases automatically.
it collects git's subcommands by Get-GitCommands, which parses git --help -a to get all git's subcommands.
Then it defines the wrapper functions for the collected git commands.

My question is: why is git --help -a called so many times (possibly infinitely) when invoking Enable-GitAliases, which causing significant slow down?

After writing the code, I found Enable-GitAliases takes too much time (I've never seen it finishes).
According to the Task Manager, the git --help -a command is launched and exits repeatedly.
I expected the git --help -a command is called only once.
Actually, Get-GitCommands | % { echo $_ } calls git --help -a only once.
What is the difference, and what is best way to fix?

I have two scripts in my PowerShell Profile (CurrentUser.AllHosts) that are causing me to scratch my head as they give different results on what is seemingly the same console. On Powershell (elevated) the scripts work with no problem whatsoever but in ConEmu (elevated) and Powershell ISE it fails with an Invoke-RestMethod error - see complete error below.

The scripts are

Using git --since and 8 days before, it returns commits in 20 days range