Nathan Rowley nrowley71115

I'm an Electrical and Instrumentation Engineer in East Texas. On the side, I'm pursuing my masters in computer science

0 followers · 1 following

Eastman Chemical Company
Longview Texas
in/nathanrowley

View GitHub Profile

Recently created

Least recently created

Recently updated

Least recently updated

karenyyng / Git_mergetool_tutorial_with_Vim.md

Last active April 3, 2025 09:13

How to use `git mergetool` to resolve conflicts in Vim / NeoVim

Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool
- Finding out what mergetool editors are supported
mergetool simple code example for vimdiff
- Resolving conflict from a Git pull
Other great references and tutorials

whoisryosuke / Update-branch.md

Created September 17, 2019 17:38 — forked from santisbon/Update-branch.md

Bring your feature branch up to date with master. Deploying from Git branches adds flexibility. Bring your branch up to date with master and deploy it to make sure everything works. If everything looks good the branch can be merged. Otherwise, you can deploy your master branch to return production to its stable state.

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master