pablo384

You can use the recursive "theirs" strategy option:

git merge --strategy-option theirs
From the man:

ours
    This option forces conflicting hunks to be auto-resolved cleanly by 
    favoring our version. Changes from the other tree that do not 
    conflict with our side are reflected to the merge result.

pablo384

// Duplicate classes on android, build fails
//Solve dependenci conflict.
//writhe this in app.gradle file in app/App_Resources/Android

configurations {
compile.exclude group: 'com.google.zxing'
}

pablo384

# First, check out the commit you wish to go back to (get sha-1 from git log)
git reset --hard 9d3c3a0caa7f7b35ef15adb96fc80fcbb59ac72a

# Then do a forced update.
git push origin +9d3c3a0caa7f7b35ef15adb96fc80fcbb59ac72a^:develop

# Push specific commit
git push origin 9d3c3a0caa7f7b35ef15adb96fc80fcbb59ac72a:develop -f

pablo384

#/bin/sh
#images
docker image rm -f $(docker images -a | grep -v "qtcustom" | awk 'NR>1 {print $3}')

#container
docker rm $(docker ps -a | grep -v "my_docker" | awk 'NR>1 {print $1}')

pablo384

QEventLoop loop;
    connect(this, &SomeObject::someSignal, &loop, &QEventLoop::quit);
    // here you can send your own message to signal the start of wait, 
    // start a thread, for example.
    loop.exec(); //exec will delay execution until the signal has arrived
    
    

pablo384

# delete local tag '12345'
git tag -d 12345
# delete remote tag '12345' (eg, GitHub version too)
git push origin :refs/tags/12345
# alternative approach
git push --delete origin tagName
git tag -d tagName

pablo384

# http://stackoverflow.com/a/28818420/484780
git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`