latest 20 messages by AppAraat
+
[2016-07-31T19:52:52Z]
AppAraat
is there a way to change the branch of those commits on github? Or do I have to do this on the CLI?
+
[2016-07-31T19:52:29Z]
AppAraat
hi everyone, I think I made an oopsie. I forked a repo and made some commits on a branch that I made on my fork. Later on I accidentally made some commits to the master branch while intending to make commits on that new branch.
+
[2016-03-08T11:11:29Z]
AppAraat
right, I'll have to keep that in mind.
+
[2016-03-08T11:11:00Z]
AppAraat
great, thanks very much :)
+
[2016-03-08T11:07:23Z]
AppAraat
what I mean is, git will tell me if there's a merge conflict in that case, right?
+
[2016-03-08T11:04:50Z]
AppAraat
ah like that, I see. And I'd be notified of a merge conflict if there have been changes (from the original repo) to the file I've made changes to?
+
[2016-03-08T11:03:03Z]
AppAraat
so for example, I forked https://github.com/tmux/tmux which became https://github.com/absorber/tmux with this being the only thing that changed: https://github.com/absorber/tmux/commit/79cc1539cdfdb6d26f58c87148e58f7d1338f516
+
[2016-03-08T11:01:49Z]
AppAraat
hello, I have a question, I want to have the latest changes of a repo, but with a custom line of code added to it. I've forked the original repo and added my line of code, but I want it to be auto-synced to the original repo. If changes to the file where I added the code have been made, then I'd like to get notified to let me choose which version to use for my own fork. Is that possible on Github?
+
[2015-05-11T19:35:11Z]
AppAraat
this is what initially made me ponder as well, I thought pasting plain text would automatically turn the mail into plain text as well, but from now on I'll simply send mail in plaintext now that I know which option causes this.
+
[2015-05-11T19:31:09Z]
AppAraat
ah I see, thanks. Never occurred to me. I don't post frequently to mailboards.
+
[2015-05-11T19:28:45Z]
AppAraat
I thought I was, I just copypasted text from vim
+
[2015-05-11T19:27:13Z]
AppAraat
I simply sent it from gmail.
+
[2015-05-11T19:26:57Z]
AppAraat
550 5.7.1 Content-Policy reject msg: The message contains HTML subpart, therefore we consider it SPAM or Outlook Virus. TEXT/PLAIN is accepted.! BF:<U 0.568163>; S1754104AbbEKTUR
+
[2015-05-11T19:26:55Z]
AppAraat
The error that the other server returned was:
+
[2015-05-11T19:26:48Z]
AppAraat
Google tried to deliver your message, but it was rejected by the server for the recipient domain vger.kernel.org by vger.kernel.org. [209.132.180.67].
+
[2015-05-11T19:23:37Z]
AppAraat
iveqy: hi, I tried sending a mail to git@vger.kernel.org but I got a mail saying that sending mail had failed permanently.
+
[2015-05-11T06:22:35Z]
AppAraat
thanks, I'll definitely look into it :)
+
[2015-05-11T06:15:38Z]
AppAraat
either that or I was wondering if he would be able to recommend me further places to look.
+
[2015-05-11T06:15:02Z]
AppAraat
iveqy: I was particularly interested in Git trainings for trainers, and from what I've seen he seemed to be the right person for the job.
+
[2015-05-11T06:12:30Z]
AppAraat
hello, can I find Scott Chacon here? I've sent him an e-mail and was wondering if I got the right e-mail address. I'm not sure if I can paste it here, but it's the e-mail I got from his domain info (www.scottchacon.com)