all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Branches are Scary
@ 2015-12-17 21:25 Phillip Lord
  2015-12-17 21:49 ` Ingo Lohmar
  2015-12-18  7:20 ` Eli Zaretskii
  0 siblings, 2 replies; 12+ messages in thread
From: Phillip Lord @ 2015-12-17 21:25 UTC (permalink / raw)
  To: emacs-devel


I was wondering if anyone could describe the git setup wrt to branches
on the main Emacs git.

I always find deleting branches (that I have created) rather an unhappy
experience, as I worry that I will do the wrong thing, and accidentally
delete emacs-25.

At the same time, if I am understanding things correctly, I can't squash
and force feature and fix branches that I have pushed up, which means
that these have to get deleted unmerged cause I squash and merge locally.

Perhaps I am worried about this unnecessarily. Can I delete emacs-25 or
master by mistake? And, at the same time, is it possible to squash
things in other branches?

Phil



^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2015-12-18 16:46 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-17 21:25 Branches are Scary Phillip Lord
2015-12-17 21:49 ` Ingo Lohmar
2015-12-17 22:20   ` Phillip Lord
2015-12-17 23:35     ` John Wiegley
2015-12-18  7:28     ` Eli Zaretskii
2015-12-18  7:49       ` Yuri Khan
2015-12-18  9:05         ` Eli Zaretskii
2015-12-18 10:43           ` Phillip Lord
2015-12-18 15:48           ` Random832
2015-12-18 16:10             ` Eli Zaretskii
2015-12-18 16:46             ` Phillip Lord
2015-12-18  7:20 ` Eli Zaretskii

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.