so basically I:  Made a Github repository and cloned it to my desktop Modified the README.md file from Github and forgot to pull it to my desktop Made over 10 commits from like 2 hours of code  Git won't let me push: ![rejected] error: failed to push some refs  Git won't let me pull: Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.  What can I do?
16192
I want to resolve merge conflicts in my Git repository. How to do that ?
29319
I have a problem with the MiKTeX package manager. I receive the message:  The MiKTeX web service has rejected your request.  Possible reason: too many requests arriving from your IP address.   and:  HTTP Error 503. The service is unavailable.   I cannot even choose another repository. Maybe this all was caused by my having killed the process on my first try with ctrl-alt-del? Can it be that at the server a "zombie" of that killed process is still present? Will the problem go away by itself?
35766
I don't know how I did manage to do it.  I just ... Oh wait, did I do it actually? I actually simply approved it! You can see it . Apparently, I made no changes myself.  But now I'm struggling to understand how exactly was I able to do it, because in 79% of cases I am greeted with this message:        and in another 20%, this faked "improve" goes through (while I don't change completely anything) and I can haz a binding approval vote :D  And in other 1%,  it when I clicked improve (now I know ).  So it's definitely a bug, but I can't find the exact way of reproing.  Note: earlier there was actually a bug which allowed me to approve an edit by clicking improve and submitting with no changes, then it was fixed and for some time the message I've shown above stopped me constantly, and now there is another bug
40898
Trying to install  from source. I did try the usual methods like using make. There is nothing related to installing in the readme file and could not find a configure folder.  So how do I install this?
114963
I have a  that has been working since it moved there.  I did a git pull this morning, and am now getting errors:     $ drush      Warning: require(/home/mpd/drush/vendor/autoload.php): failed to open   stream: No such file or directory in   /home/mpd/drush/includes/bootstrap.inc on line 1007      Fatal error: require(): Failed opening required   '/home/mpd/drush/vendor/autoload.php' (include_path='.:') in   /home/mpd/drush/includes/bootstrap.inc on line 1007   How can I fix this?
29423
I've got a repo that I contribute to within an Organization that I administer. I'm trying to add it to careers, but it won't allow it. Is this on purpose? I don't really want to fork it to my personal account, since I won't be maintaining it from there.
102164
I can't say what steps brought me into this:  → sudo apt-get upgrade  Reading package lists... Done Building dependency tree        Reading state information... Done 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1 not fully installed or removed. After this operation, 0 B of additional disk space will be used. Do you want to continue [Y/n]? y dpkg: error processing libtiff4 (--configure):  libtiff4:i386 3.9.5-1ubuntu1.1 cannot be configured because libtiff4:k386 is in a different version (3.9.5-1ubuntu1) Errors were encountered while processing:  libtiff4 E: Sub-process /usr/bin/dpkg returned an error code (1)   The following commands all end up in the same error:  sudo apt-get install -f sudo dpkg --configure -a sudo apt-get --fix-broken install sudo apt-get --fix-missing install sudo apt-get clean sudo apt-get autoclean sudo apt-get autoremove   How to solve these kind of problems? And what did I do wrong?  UPDATE I managed to get apt working again by downgrading to previous version (3.9.5-1ubuntu1). However, next upgrade led to the same problem. But there is more info now:  (Reading database ...  dpkg: warning: files list file for package `libtiff4:k386' missing, assuming package has no files currently installed. (Reading database ... 281166 files and directories currently installed.) Preparing to replace libtiff4 3.9.5-1ubuntu1 (using .../libtiff4_3.9.5-1ubuntu1.1_i386.deb) ... Unpacking replacement libtiff4 ... dpkg: error processing libtiff4 (--configure):  libtiff4:i386 3.9.5-1ubuntu1.1 cannot be configured because libtiff4:k386 is in a different version (3.9.5-1ubuntu1) No apport report written because MaxReports is reached already                                                               Errors were encountered while processing:  libtiff4   So the real problem seems to be the missing libtiff4:k386 package. And k386 seems like a stupid typo somewhere.  I tracked down the file that introduces the typo:  **/var/lib/dpkg/status**  Package: libtiff4 Status: install ok half-configured Multi-Arch: same Priority: optional Section: libs Installed-Size: 528 Maintainer: Ubuntu Developers &lt;ubuntu-devel-discuss@lists.ubuntu.com&gt; Architecture: k386 Source: tiff Version: 3.9.5-1ubuntu1 Config-Version: 3.9.5-1ubuntu1 Depends: libc6 (&gt;= 2.11), libjpeg62 (&gt;= 6b1), zlib1g (&gt;= 1:1.1.4) Pre-Depends: multiarch-support Description: Tag Image File Format (TIFF) library  libtiff is a library providing support for the Tag Image File Format  (TIFF), a widely used format for storing image data.  This package  includes the shared library. Homepage: http://libtiff.maptools.org Original-Maintainer: Jay Berkenbilt &lt;qjb@debian.org&gt;   Fixing the typo solves the problem.
77290
Our team accidentally pushed some personal information onto Github in the form of a H2 database file. Is there any way to remove a file cleanly and completely from the server?  Simply doing git rm xxx.db does not seem to be the answer because one can easily git reset --hard to the head which contains the user data.  On the other hand,  git reset --hard [the head before the db file was committed]   is also not our preference because there have been more than 10 commits since the database was committed.  What should we do to remove that database file?
106622
If I do this:  alias g='git'   I loose all completion rules (i.e. branches and remotes are no longer being automatically completed when I hit TAB after typing, for example g push o).
11736
This is, how I download various master branches from GitHub, and I aim to have a prettier script (and maybe more reliable?).  wget -P ~/ https://github.com/user/repository/archive/master.zip unzip ~/master.zip mv ~/*-master ~/dir-name   Can this be shorten to one line somehow, maybe with tar and pipe?  Please address issues of downloading directly to the home directory ~/ and having a certain name for the directory (mv really needed?).
12262
I need an elegant solution to store my dotfiles on GitHub for easy access. I tried to create a dotfiles directory and symlink all the dotfiles into there. Then I tried adding the symlinks to git and committing in that directory, but git saves the links not the contents of the files it points to. Is there a way to do this or something similar?
102771
I came across a  where a comprehensive example would be very useful. So I wrote an example program showing one way to solve their problem.  My problem is that when I was done creating it, and testing to make sure it worked, it was over 400 lines in 18 files. My example included source code, header files, and scripts for building the example in a variety of circumstances.   It's a working and tested, so it's of huge value to illustrate the tricky solution, but because it's all there, my response was huge! Is there a better way of posting my code dump?  Edit:  I guess there isn't a current "best way" to include a large chunk of code, so I made this a feature request and tried to add some ideas.  Perhaps code entries that are longer then a certain number of lines, or ones that have been specifically marked could initially be displayed as "collapsed", and someone could expand them if they want to see them?  Or maybe, like attaching images, users with enough reputation could attach an archive of files. They could be displayed as "attached code" (initially collapsed also).  Some problems have simple answers that unfortunately touch disproportionately large parts of the program, or can be solved in slightly different ways depending on the environment. I feel that stackoverflow needs a way of capturing these large solutions. Sometimes, they're large chunks of code. In my case, the code was small, but there were many files.  Using github or a similar code repository is great, but we risk linkrot (even for big guys like github) and loose the community editing, commenting, and voting abilities.  I understand the problems that could come from with people dumping whole "I can't get this to work" packages, but surely we already have a solution for that in moderation.  Edit again:  I'm starting to see that this may have been already addressed in posts like    , and    If you feel this a dupe, I'm open to having it "closed as already addressed"
72249
After considering the answers to my previous question (), I've decided to take the 4 or so repositories I have and consolidate them into one. This of course leads to the question, what's the best way to do this?  Is there a way to combine two or more repositories maintaining the version history for both?  Edit: I should also point out that I'm using Assembla.com, which does not provide access to the svnadmin command, AFAIK  Another edit: Does this even matter? If svnadmin works on URLs, then it's no problem then.
58667
I'm merging in a remote branch that may have a lot of conflicts.  How can I tell if it will have conflicts or not?  I don't see anything like a --dry-run on git-merge.
43265
When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?
13757
I'm moving all files to a new computer, via an external hard drive. I am certain that broken links will be a concern. What can I do to fix this? Is there a 'Best Practices' kind of way to prevent this problem beforehand? I have many hundreds of .blend files, and of course, I fear losing them.
42880
I'm completely new to Bash, and I'm trying to make a simple script to automate Git pulling and pushing from a repo, but I can't get it to work.  Here is a pastebin of the code:   #!/bin/bash #Git Puller / Pusher for MobArenaBattles  echo "Please type whether you want to pull or push:"  read proc cd $HOME/Desktop/IdeaProjects/Plugins/MobArenaBattles  if ["$proc"="push"]; then   echo "Please type the commit message:"   read message   git status   git add -A   git commit -m $message   git push elif ["$proc"="pull"]; then   git status   git pull else   echo "Invalid choice! Exiting." fi   The error I get is:  ./MAB Git.sh: line 9: [push=push]: command not found ./MAB Git.sh: line 16: [push=pull]: command not found   I have tried using == and -eq but it comes up with the same error. Sorry if I'm being stupid, it's my first attempt.  Thanks in advance.